Merge tag 'upstream/1.8.0+dfsg'
authorJochen Sprickerhof <git@jochen.sprickerhof.de>
Mon, 15 Aug 2016 15:10:08 +0000 (17:10 +0200)
committerJochen Sprickerhof <git@jochen.sprickerhof.de>
Mon, 15 Aug 2016 15:10:08 +0000 (17:10 +0200)
commit406caa3f160881cd651fae4072ced08b9f4cbfa3
treec69d407f8303913af77575249db2a6c829438f27
parent12f9f4406194305f5f8ed6bbe1989f0be0e7ea41
parentb33c6dbcef571244fc9bcbf8c1ac12d4dc791689
Merge tag 'upstream/1.8.0+dfsg'

Upstream version 1.8.0+dfsg